@@ -3,6 +3,7 @@  | 
            ||
| 3 | 3 | 
                import shortuuid  | 
            
| 4 | 4 | 
                from django.conf import settings  | 
            
| 5 | 5 | 
                from django_logit import logit  | 
            
| 6 | 
                +from django_query import get_query_value  | 
            |
| 6 | 7 | 
                from django_response import response  | 
            
| 7 | 8 | 
                from json_render import json_render  | 
            
| 8 | 9 | 
                 | 
            
                @@ -39,7 +40,7 @@ def screen_admin_oauth(request):  | 
            ||
| 39 | 40 | 
                 | 
            
| 40 | 41 | 
                @logit  | 
            
| 41 | 42 | 
                def screen_admin_loginqr(request):  | 
            
| 42 | 
                -    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
               | 
            |
| 43 | 
                + brand_id = get_query_value(request, 'brand_id', settings.KODO_DEFAULT_BRAND_ID)  | 
            |
| 43 | 44 | 
                 | 
            
| 44 | 45 | 
                token = shortuuid.uuid()  | 
            
| 45 | 46 | 
                 | 
            
                @@ -70,8 +71,8 @@ def screen_admin_login(request):  | 
            ||
| 70 | 71 | 
                 | 
            
| 71 | 72 | 
                @logit  | 
            
| 72 | 73 | 
                def screen_admin_loginrst(request):  | 
            
| 73 | 
                -    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
               | 
            |
| 74 | 
                -    token = request.POST.get('token', '')
               | 
            |
| 74 | 
                + brand_id = get_query_value(request, 'brand_id', settings.KODO_DEFAULT_BRAND_ID)  | 
            |
| 75 | 
                + token = get_query_value(request, 'token', '')  | 
            |
| 75 | 76 | 
                 | 
            
| 76 | 77 | 
                admin_login_key = SCREEN_ADMIN_LOGIN % (brand_id, token)  | 
            
| 77 | 78 | 
                 | 
            
                @@ -13,6 +13,7 @@ django-mobi==0.1.7  | 
            ||
| 13 | 13 | 
                django-models-ext==1.1.8  | 
            
| 14 | 14 | 
                django-multidomain==1.1.4  | 
            
| 15 | 15 | 
                django-paginator2==1.0.4  | 
            
| 16 | 
                +django-query==1.0.3  | 
            |
| 16 | 17 | 
                django-redis-connector==1.0.1  | 
            
| 17 | 18 | 
                django-response==1.1.1  | 
            
| 18 | 19 | 
                django-rlog==1.0.7  |